:bug: fix minor bugs