Minor changes/rearragements/suggestions.