New commands + fixes