tweaks to location code
added 2 templates, tweaked a few things
mainly cosmetic changes