Fixed a few typoes and added some todo