small improvements, cube not stable yet