Nothing really
Moved quad code from workaround
Fixed small bug