clean up some bugs in battleships (still not finished)