Improvments and fix