Semi-fix the @NAME command
Add more @CLEAR support
Basic @CHOICE input added
Update @CHOICE