further data edits, UI edits