further fixes but still have problem