Fixed a few reorganizational bugs, removed a few unnecessary prints (now that we have GRAPHICSgit diff)