Fix typos and inconsistencies

Some minor things I came across and felt the urge to clean up. As it alters the public API you are free to decide whether or not you want to merge this.