Don't mean to offend CM, but please fix the current bugs and stop tweaking on the code.

IMO there are no enhancements required.

Get it working and leave it be.