Conway's Battleships, Revised and Expanded