Correct names and instructions
Update todo list