Fixed writeOut() and made the server use it.
Also re-fixed the key names for addLocation(). Why the hell was that stuff reverted?
Rename the output file so it's used next time