Loading counter fix, small bugfixes