After you file

The answer is yes as well to your second question.  You will not get the stimulus check until you fix your return.