Made bugfixes and tested Validator