First improvments and fixes