Store ship name in closure; fix disable comms