Changed a few strings and some logic