Fix links, update to new diddleman