Rage powder fix

Part 1 of fixes. I want to get this in though because its important in fixing the following issues that I might need help with.