FIX: Resolved splash and burining effect bugs