Cleaned up branching code. Job of start point now given to line list view