lots of fixes and updates to alignmodel