Remove reference and default arguement - this causes a strange compiler error.
Fix bugs in step 0.