curl fakeisp to correct location
tidy ups all over the place