I have always just added a simple syrup corn sugar solution to my bottle-filling bucket right before I bottle. As long as you are using the right amount depending on the beer you shouldn't have a problem. I have no idea about waiting. This has always worked for me and I've never had a batch 'splode.