I love this comment. Thank you for putting the time in to proposing a more thorough solution. I will take this (and other) comments into consideration, and make some much needed improvements :)
- https://www.crypto101.io/ both the presentation and the book.
I think those are good to begin with.