Some enhancements and fixes to Controller process

Should be well-documented in the commits, but any questions, let me know