added header stuff and user clumping to parser.py