added volume graph and refactored a bit
added volume graph and refactored a bit