bugfixes and updated report