Implemented comments by @cdeil
Implemented more comments by @cdeil
Added Reference/API headers