get rid of most warnings
60 files changed