Device commands DONE - need tidying