Redone direct integration
Bug Fix VaR and major housecleaning