Better location handling (bugfix for junibreh)
Better location handling (bugfix for broken links)
Core update (summer style remix)