Clean up print statements, minor bug fix