Added utils, fixed parsing a little