Cleanup some controller handling and localize device types
Merge pull request #313 from LoungeKatt/master

Cleanup some controller handling and localize device types