fixing paths and ops, testing