lot of small changes