Location is now validated; fixed misc small things.