All characters have 2x masturbation scenes, so make sure you got both. And some characters have post-story h-scenes. Sex in front of others doesn't count as another scene.
As for the CG thing, it may be a bug that I've already fixed I believe, just an inaccurate count bug. Clicking the 'update old save' button in the in-game settings might fix that.