Some initial additional changes / bugs.
Also some UI items removed so as not to be distracting.