some further fixes