Gave up on converting FVL to use matrix methods. Few minor changes.