some small fix's