Made minor fixes and added some to-dos.