theory tidy-up, final cjhecks remaining