more tags, small corrections