fixed more commands