New commands and some fixes -2
New commands and some fixes - stupid bug