A bunch of fixes, prints, and comments