make changes a la this fork https://github.com/pschmitt/picotags