update header comments and minor things