Minor fixed and structure changes.