Minor, final changes
Merge pull request #1 from nycooookie/wip

Minor, final changes