added surf and paddle
cleaning up