Version update.
Refactoring, tweaks.  Not extensively tested yet.