small fixing bugs