fix various matters