updated, added analytics, added bugfixes