Added more improvements as well as // FIXME comments to find todo's easily
Added more improvements as well as // FIXME comments to find todo's easily