Lot os small changes