some fixing up
Merge branches 'master' and 'master' of https://github.com/l00pen/cube
Some descriptions