shape fixes
classes removed
oscilation fixed