context menu improvements, prompt improvements, bug fixes