Tweak schema, add some help texts and choices hint