fixed some magic numbers vol6