updates, mostly working