Make it run normally, some cosmetic fixes.