Reworked validation for all existing modules. Removed most logic of point-counter for later rework