Fixed headers
Merged
Added a few comments