+ Changes due to moving matrix stuff into wavellite-math