many small changes
fixes