Base economy, enable and disable events

also ran cleanup