Changes fixing some minor problems.