Fix another NPE
Make /sw list more readable
Oops, looks like I forgot to add the prefix.