various changes after flight tests