Revert "cleaned up compiler warnings"

This reverts commit 9ded58425afd5c065c336e59dde08c031ee62492.
Revert "Mostly working!"

This reverts commit 85bdeaa2be55360e916166d02e258d1b4f04348f.
reversion