Wired up example selection and clean some other stuff up