Clarify comments
Fix includes