Fixed some validations. Some bugs to fix.