Code

show-branch: usability updates.