bugfixes, added progress