Added More Validation and Fixed SOme Bugs