updates to includes and changing to default settings.