Rrearranging & bugged ship repaired