Alignment and random small improvements