Allow multiplication in volume; various related refactoring.
Fix bug in validting price