fixing last of the errors....almost
it compiles