some small fixing