added link unshortening, model fixes