fixed some magic numbers vol5