small changes all over the file