added/fixed few headers

https://github.com/borisyankov/DefinitelyTyped/issues/1570

cleaned up some more