Export working, plus some link drawing improvements