somewhat working; also remove some quaint vestigials