Version 1.25b2

Continue work on keysets
Commit hopefully final tweaks, tests not complete.