Added imbedded comments fix and reference checking.