shiptypes, wider canvas, clean up