Add comments and suggestions

Also, all \t chars in the codebase should be replaced with two spaces (as per conventions).