minor changes in headers and prototypes