Some fixes and some comments.