bugfixes and modal progress