Fixed quirk with box. Adjusted some things.
Merge branch 'master' of http://github.com/MarcoPolo/divergence