Trying to fix 'missing files' bug.

> Also ran a cleanup, which added lots of @override
> And did a small fix for parser, working on allowing edit to delete
tags