fix pathway bugs and update decouple to v2