header documentation, other clean up