DESIGN: some minor alignment changes