Resolved some todos
Merge branch 'master' of github.com:WoltLab/WCF