clean up imports some more.
more TODO:s around questionable things
move rendering stuff into render