Fixes the weirdness with the baseurl stuff.
Small tweaks.