Minor typos and general fixes