Fixed some stale comments
Tweaked some text