cleared up a lot of todo notes