Minor tweaks to building routines, disabled freighter pending rewrite, need to merge mobile-pathing with the mobile class