GUI prompt and other fixes