- fixes and class movement