ProposedTerm stuff
more tweaks
Tweaks