further fixes from comments