More parser work, UI updates.