updates - now mostly working