parse things better :/
slightly better option handling
cleanup
parser fix + cleanup