A bunch of stuff

Fixed analyzer issues
Cleanup to usage of hop
Ran code through pre-release formatter to see what got found/fixed/broke