loading feature and bugfixes