automplete fixes and validation activated