Header fixes and Transform class