Some Validation n Bugs Fixed