More cleanup. Add land selection.