Fixed typos, changed header guards to have HPP suffix