added smoke animation for #1986 and fixed various bugs