Implemented a couple of /u/smog_alado's changes

Wasn't able to identify all of the changes since I don't have a ton of time in the middle of the day.  /u/red_agent might take care of the rest