more threashing, mostly around parsing