refactor t/m url etc
fix overflow; must have been some merge error