Chemo stuff with Cancer explosion fix
merged master into chemo