final alignment fixes