feedback changes && validation && other bugfix