some added functionality and bugfixes
Merge branch 'cubes' of https://github.com/simonem/dontpanic into cubes