Adjusted some print statements
Merged from master.
Minor bug fixes