sync up changes from rjm repo; add slow_death