fixes many things, adds some too. yet to get to service details though...