minor bug fix, note: fix other small issues later