finish up alignment refactoring and fixing