Finalized truncation fixes. Continue testing. Work on Hv modifications