Handle it better when umd waits trigger during cbs.
Need wait funcs for everything, log for testing.

This way I can find what games can confirm which fixes.