should fix most of the merge errors/misclicks
small description typo fix