fixed parser..ostensibly...todo: make less hacky and gross