Cleanup FARControlSys, some other tweaks