many small changes