fixed some magic numbers vol2