fix names and add boarding