Fixed few issues and typos.