Small changes

These changes are mostly comments, replacements and added description