first round of changes and fixes after first pre-release testing