more changes to UI and parsing