More tweaks.
Merge pull request #131 from xdothackerx/tweaks

More tweaks.