centralized header into includes; minor style fixes, some markup semantics