merged bad_guy patch from Matze Braun. (recycling Ricardo's stalactite patch and...