Should now wait for threads to complete
Fixed typos in view map
Basic testing of 'between' queries