small fixed overwrite in activity_manager
some changes to activity_manager