Removed prints and fixes