fixes bugs, changes the wording a bit