cleanup prints, warnings & a couple minor things