Sarafathulla S

I've made some enhancements and fixes that might address your concerns