local fixes and alignment file cleanup.