Validation Fixes

Fixes several server-side validation bugs.
Oh yeah, that's way better and more readable. I'll make that change, thanks!