further fixes to the stuff