bug fixes
working on todo ctr