some cleanup and fixes

some urls fixed, some addition of services, some resorting