Fixes and comments.