More simple fixes including creating a proper empty function clone routine
Lots more misc fixes, more tests pass