Better debugging hints
Fixing links