Fixed incorrect references, fixed typos