database improvements
location bugfixes