changed angles a little, fixed volume