more changes, mostly moving things around