small changes before push to public