lot of small improvments