+p1307-8

and some link fixes to AitF