done some major fixes (whales spawn now)