use old format for reverse compatability
fix up L matrix
test fixes