added ChoiceScreen (to select values). some minor fixes + formatting