Simplified controllers paradigm and a few enhacements.