many more battleships fixes