minor modifications
improved crawling behaviour