Preparing for release, minor changes