Clean up bugs, print statements