Commit KHobbits' changes, as well as some of my own