Final changes to octahedron. Rotations are still broken