Minor tweak to remove dupes + minor bug fix for command strings