website validation make more appropriate plus aome other changes also added