overhauled tags, fixed bugs in yml