Add Log-Activity support
fix indentation