Scalable explosion change, small bugfixes