More prompt improvments