Better scan alignment

Reduce the amount of manual alignment that needs to be done.