fixed parser and adding crap