Activating comments functionality
Fixing stream issues