some 'minor' improvements