set completionBlockCalled more granularly and fix copy/paste error in didShow...--should be looking for completion block calling, not prep block