added alignment. tweaked some stuff