work on REST API, incl. changes from @janschulte