General cleanup and fix of typos