fix bugs, refresh OK everywhere