Fix and improvments