fixing some warnings
more work