More updates - no longer using big matrix notation because it can't be elegant and consistent between all parameterizations at the same time, but still rewriting