Advection and dispersion of pollutants and small rigid objects under regular and random waves