Fixed validations, still working on roster fixes