add some TODO's and clean some poop up