Misc cleaning, tightened exports and moved some utilities