Bug fixes
Fixed joypad nil ref
fixed smoke collision