#46: Removed more warnings and packed little controllers into list
controller implementations.