Fixed nits and typos