various code changes.