correct alignment and other stuff