Updates, mostly working now.