a few tweaks to kick off the localized khan branch