Made more progress and improvements on parse tree generation.