Added more switch options.

This is to accomodate the increase in the Matrix class.