More fixes, getting links and misc. syntax