[FIX] alignContext stuff based on rrahn's comments