Bug Fixes + Cleanup

Had to remove print calls used in debugging