Minor changes in general; added several print/debug statements that need to be clean up in the future