Bubbles and waves on water