-Add Radio
-Add MultiChoice
Fix minor bugs