Few small tweaks, added TODO notes