minor corrections and header changes