multiple changes to prompt-related schtuffs