updated todo, and cleaned up stuff