add tags and fixes from teach