Adding more comment templates
Adding ability to add nicknames. Fixes #2