small changes for preparing a stable version