Cleaning up excessive output. Other fixes I forgot.