Update link
Minor fixes
Restrain some types
Some more fixes
Update tests