Code cleanup. Added few comments. todo and issues updated.