Misc development updates
Rename filter files for easy reference
Got location working better.