Better economy handling and a few other fixes