reorganize
Fix parsing of location