tidy up. fix to urls. better semantics