add todo section
lots of fixes and cleanup