Minor bug-fix for aligning past the end of haplotypes. Performance tweaks for alignment.