Add post alignment methods; fix bugs