Updates with correct source files from original author and working build...

...s of binaries

The files originally checked in were missing several necessary changes.