Comments

On top of the last 2 pull requests, this improves the comments