mostly working
more changes