some minor local changes
some minor local changes