Really clean and still a lot of activities ties op...

Really clean and still a lot of activities ties open in a safe manner