some bugfix after major tests