Added some changes I'd made as hotfixes back to the repo.