style fix
small changes
validation
fix
fixes