bugfixes and progress