Multi-Hop support + Several stability fixes