Commented better

See the last commit for most recent content changes!!