Made several significant changes.
Merge pull request #1 from EntranceJew/master

Made several significant changes.