Add some comments and fix some types
Set trust