Fix for component matrices, & some adjustments.