Added links
Removed last typeof