Fixed typos, removed a few issues. General cleanup.