Products Module fresh install. Shows products not available

[bunglehaze]

I have removed the old modules from VM2 when I upgraded to the latest version and added them all in fresh with no overrides. I thought it was all looking pretty good initially and then am realising that the module is picking up products withing unpublished categories and those that are out of stock - is there no way already built into the modules to check for these basic functions and if not have any of you added some code in that would do the trick?

regards