prompt tweaks, some other fixes