opts: various corrections