Patch 1

Not going to really dip my hands in just yet. These are merely quick, minor changes I made while poking through the directory. Check the individual commit descriptions.