Fixed some bugs in stalker.py