fix lockup
Merge remote-tracking branch 'origin/infektion' into gl-toolkit
fix died infections
Merge remote-tracking branch 'origin/infektion' into gl-toolkit
screen updates