a few more alignment changes