Verify master

[chb0github]

This set of changes is meant to get a better sense of what is actually working and not, and remove obvious potential bugs from having goland inspect it

[atlassian-cla-bot[bot]]

Thank you for your submission! Like many open source projects, we ask that you sign our CLA (Contributor License Agreement) before we can accept your contribution. If your email is listed below, please ensure that you sign the CLA with the same email address.
The following users still need to sign our CLA:
❌ryndaniels ❌chb0github ❌rossedman ❌peters95 ❌ma-sdnshakya ❌josh-barker-coles ❌travisf@jfrog.com

_{Already signed the CLA? To re-check, try refreshing the page.}