final changes before first pull request