Moved some things around in the auto-calbration section.
Fixed merge conflicts.