Updating UI and a few other bits and pieces