Added volume comparator, minor changes