Various Additions

This commit just has a few things that I did differently to Cherno's
code. (see CHANGES.txt for defails)