fix some compile errors (hope this is what was intended), still more compile errors