Minor changes. Added some "To do" comments. ...