clean up
Merge branch 'master' into Cahue
Progress in spots querying