fixed minor generic-bugs