cleanup and todo update