Fixed text on 1. and made changes on 2.