Added location handler and comments to files.
Merged and fixed conflicts