Added todos and small string changes.