Add some useful tags and migrate to new script version...