Enabled world-fix again and made some cosmetic changed.