Removed some print statements
Reverted some supposed bug fixes