fixed EVERYTHING and removed print statements