WIP: Feature/cfd 144 log group activity fixes.

#136 

This PR addresses the comments from #136.