many changes, adding tags broken