We consider numerical strategies to handle two-dimensional water waves in a fully non-linear regime. The free-surface is discretized via lagrangian tracers and the numerical strategy is constructed carefully to include desingularizations, but no artificial regularizations. We approach the formation of singularities in the wave breaking problem and also model solitary waves and the effect of an abruptly changing bottom.