fixes, minor modifications, removal of killable actors/threads/etc, renaming and moving around