small glitches

and going towards more alignments