some mapping updates and header