some fixes + restclient recipe