Change wrap defaults, work on wrapping more