more comment fixes
fixes to kill() and join()
fix merge conflict