Many small changes and polishings