Various improvements before the release