Implemented smoke, and made some fixes to the handling system.