fixed errors after oop move