s4 stalling...

Hi folks
I had my s4 out at the weekend for the first long spin..I'm getting used to the gearing and town driving..The only problem I had was that when I slowed down to stop or nearly stop, the bike was cutting out..As the day went on I found myself having to keep hitting the throttle and slipping the clutch in towns to keep it from stalling in first gear..Any ideas?..It's due new belts which are going on this week..Is there a way to adjust how it idles..I felt like using the choke when i got into slow traffic to keep it going but this is obviously not the answer...
Thanks