reword some bugfixes