Added alignment features, and code to compute alignment probabilities