Branchmap works reasonably well so far; formatting cleanup; broke out some point adjustment functions