Add comments
Cleanup
Simplify custom tag signature
Improve match usage
Improve debug helpers