Validators tweaks
cleanup
Updated demo
Rethink extend