bugfixes and better feedback