adjust to changed adria syntax, minor features