Fixed validator, removed debugnesses.