Added single-tagset, pertag patches