While reviewing !7 (merged), I found a bunch of small issues that I wanted to address directly without going through issues creation