cleanup

Minor cleanup and corrected a few commands.