Crawler fine tuning + preparation for front end