fix bugs
misc