Bugfixes, added loading indicator