Monday Mutant 41: Battleships

Thirty ships (as indicated below the grid: three four-cell ships, six three-cell ships, nine two-cell ships, and twelve one-cell ships) are hidden in the grid. The ships may be rotated from the orientations shown, but may not overlap or occupy cells which share a corner or an edge. A number to the right of a row or below a column indicates how many cells in that row or column are occupied by ships. Additionally, some segments of the ships are shown within the grid, and cells with wavy lines are "water" cells which cannot contain ships. Find the ships.
Now with 200% more ships and 189% more grid! Also, this doesn't count as part of my series of seventeen 17x17 puzzles.