Updates and Compile error fixes

Updated Comparison with the working version, it was the old nonworking
version, and debugged the compile time errors out of it.