more kills and fixes #3