add some more parsing