more improvements on sevenweekwater crawler (re #218)