Bugfixes, charts and location management