some corrections + new op