v3.6.3.5

Cleaned up to much without able to test it, thanks ubergoober for
pointing it out.