cleanup
changed title
new validation
functional tests