fixed some awful broadcasting issues
Added volume element iteration
Resolved merge conflicts from issue 360.
Removed unecessary tolists()