consistently use uid instead of id
Merge branch 'master' of github.com:debolk/blip
refactoring; unstable
almost stable
done refactoring and implemented update