Cleanup ship data, move some more messages to the messages.properties