fix bugs, not all