Small bug fixes, rewording of instructions, and exception handling