fix small bugs