Final changes, reference checks and imbedded comments added