killed all globals
added TODO note
minor tweak to comment