Preparing for release version
More little updates for release version