Fix some references.
Some compile errors.
Fix comments.