faster mapping and such.
working on unifying some treatments of constraints and things.
more work on constraint refactoring.
more refactorings.
sigh.