several fixes for activites and services