remove debug information, fix broken test and other small fixes