Minor changes and print statements