many, many rw re-org and other changes