Recent activity debugged and cleaned up