Fix broken code, add TAGS support