Minor updates - nearly done