Mutilple Bugs Fixes but breaks validations