Council to put finishing touches on water ordinance