- fix small bugs