Added correct answer and edit-function