small updates
merge upstream to local
merge Enragerx's changes - thx !
trying to fix blood tap