Move shortcut branch up
Update quad_to_matrix comments