cleaned up outputs for way and node
minor changes to extract