fixes in commands