minor improvements, especially in prompt functions