many changes:
-- cleaing the code
-- having the more generic version of the flux matrix