Envoy Tasks and Fix Bugs