fixed some merge issues with @shadekiller666 's code in the 1.8 branch

THIS DOES NOT WORK, i am waiting on forge to fix the next brunch of
errors