Numerous controller improvements