tags field added and mninor tweaks