Add quads
change default compiler
Fix merge conflicts