Revert "Revert "cleaned up compiler warnings""

This reverts commit 39538ee55022691b4cfa3cc9f4ca3be10246a02d.
Revert "cleaned up compiler warnings"

This reverts commit 9ded58425afd5c065c336e59dde08c031ee62492.