todo notes and minor tweak