Fix broke
New commands and some fixes