hopefully cleaned up todo list a little more