Add defaults, fix overdraw.