Changed alignment parameters
Updated makefiles