Committing a variety of bug fixes - partnered with Sorrachai