fixed deprecated calls
validation improvements