sill trying to fix validation.. few other tweeks