ixed some Magic number issues
ixed some Magic number issues