Some tidying up, plus the beginnings of a bluetooth command.