work on moving crewSelectorActivity around, etc.
merge fixes