further fixes
further fixes 2