Fixed message table issue; fixed first-run issue.