cleaned up economy, fixed bugs related to doing consecutive builds