fix small bugs
make crawl more under controll