Updated most of iChun's mods
Merge pull request #600 from GrygrFlzr/master

Updated most of iChun's mods