minor changes
Operations + integration + tests