Fixed bugs with location filter
Merge branch 'newinterface' of https://github.com/gtfierro/walkthedinosaur into newinterface
Fixed conflicts