Typos and other small fixes

@hman take a look at these fixes on Monday as I might do more commits until then