tweaked prompt, misc cleanup