Support subwalks; some bugfixes