mistakes were made
mistakes were fixed

GitHub pull request diff: +68 -25,288