Fixed some typos and wrong data encapsulation in headers