rewording and updated todos