updating to latest, more UI work