Prompt added, correction of bugs