Refinement
More refinement.
Fixed errors.