Fix a bug in argument validation. Force %$p > q$% in output. Use