Overtime Changes

Just a few additional tweaks to the code, cleanup, etc. I've added some inline comments to the files changed.