Changes that were made at the aerospace meeting on 8/22.
Fixed conlicts from merge.