Fixes some of the box bugs.
Reinstates more workflow.
Merge pull request #7 from jettisonjoe/master

More good stuff.