Added prompt, bug fixes