clean
 stuff
 more fixes