Fix bugs and add age, and state selector