Minor updates. lots of work to do