Refining some things for release "beta"