Added object aligner. Now going to phase 2 when fatal. Fixed some bugs