Small improvements
fixed explosion