More rigorous checking of --bunch option
Nicer error message for invalid options

Remove unneeded header and option check