Fixed more compilation errors.  Added addition decompilation results for comparison.