Fixed a few bugs in walker.py