Eclectic Expansion Enterprise: Updating Experimental Branch to Build 7_E4

Hey Everyone, Just a quick bugfix, and I had another change finished, so I'm bundling that in. The hard reset fix I had to change around some code ordering. I think I got most of the issues sorted, but do let me know if…