Started removing magin nums.
Done
Merged master into iss6.