tightened up base topos code