many small changes...