more todo elements and some cleanup