further fixes!!!