correction of several issues.