clean up comments a bit, leave fixme's to deal think about