a few changes to prompt etc