many misc fixes
Merge branch 'master' of github:FotoVerite/nametagday