cleaning up compilation errors and some type changes.  Down to 3 compilation errors