Link fixes, usage tweaks