Fixed a few bugs, cleaned up printing and stuff
fix printing