Fluffos Fixes

included are my fluffos fixes.