Created a new, simpler workfile.
Fixed GCC4 compile errors.