added changes made during flight to BS meeting, not yet cleaned up