added further fixes