cleaned up lots of warnings, down to about 5