Clearer formulas for computing rotations. But still has odd effects on cube rotation.

Signed-off-by: Laurent Bernabé <laurent.bernabe@gmail.com>