copy from dev/test22d
update. this version does not have the proved sub-tp/refl, but will make things easier in the short run.