Fix some consistency issues
Fix the link