Update Autopair and some minor ordering