Internal alignment + speedups