fix various small bugs