Remove TODO

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Amend some credits

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>