Bug fixes + more parsing