small changes that should have been in the last commit
Merge branch 'cubes' of https://github.com/simonem/dontpanic into cubes