1) That depends upon the terms of your actual 401(k) plan, as well as the employer's severance policy. But it sounds like that contribution was made after you had already done the IRA rollover, and this your participation in the 401(k) was "closed."
2) You can try asking the IRS for a waiver of the penalty because of the max up with your employer.
