Did some improvements to activities