more fixes to parsing algorithm

more UI updates