badformat parser fixed ... for good this time I hope