Get controller scan/rescan working, minor cleanup to other stuff.