Merge pull request #1 from chasemerlin/beta-launch

This iteration will become the final version.
small changes
try to fix conflicts
blah