Processed e-mail comments and made a added a few more fixes and TODO items.