Overhaul pull request before launch

These changes are necessary before we go live. Please consider pulling my changes to the main overhaul branch. The Finnish language file will follow tomorrow. Thanks.