more fixes to part I