cleaning up. changing defaults