cleaned TODO's and FIXME's up