fixed alignment&stuff