rearrange and tweak definitioins; fix definitions vs. theorems conundrum