Got rid of some bits that aren't needed
Fixed Opacity Scaling