Miscellaneous Improvements

Just some simple stuff.