Ability/fixes to be able to add new people and refocus tree
Merge branch 'v0.2'