fix minor bugs
back to the prev