Added/revised a few more commands