A few command reworks