Updated todos and minor text fixes