Miscellanous fixes

Miscellaneous fixes based on feedback from the most recent training session and on requirements for the upcoming training session.