Small improvements

Add some comments.
Chagne header to forward declarations.