(Many small changes)