some work on main tasks

some clean up