Various tweaks, got friendly device names working