fixed headers and register messages