Cleaning up debug code
Style cleanup
Be more selective about serving location info

Only serve needed columns