Fixed warnings, and cleaned up
version dump