fixed a crap ton of specs, cleaned up validations