merged a stash, mostly testing, comments, and other minor changes
merged stashed changes, just print statements.