changed many small things and some output options in alignment routines