refactored actors & some shit