Several small Refactorings

Added an integration unit (d(A)):

phases are now correctly calculated in the appropiate unit...