krisgesling Fix station matching and cleanup