fixes and validate command section