Dwimcore's additions plus full comment and tags support

This repo was forked from Dwimcore's version, and full commenting and file tagging support is added.

I know this most probably contains unwanted changes, and I'm happy to fix those, if they can be discussed here.