bugfixes on moving people around.
Merge remote-tracking branch 'origin/master'