more bugfixes and idea testing