Fixed pull request review comments up to and including june 20th 15:33