fix formatting and add missing cmd outputs