I've added Eagle Rock (so should show up soon), but much of this needs an on-the-ground survey. Your notes are very useful, but if you're brave enough to try the editor you are probably the best person to make the changes. 