values validation fixes and style changes