more changes, mostly finished now