more fixes in commands