Started making changes from Tag's suggestions.