Started getting rid of unwanted additional variables etc
Got rid of warning messages
Got rid of warning messages during C++ compilation
There are no warnings now either in the C++ or fortran parts