fix commands and specs