some minor code changes.