rolling version (not yet publishing) and cleaning up lib a little