fix validation
init once
renam methods
add test