several and minimal fixes