need to test the whole selection stuff
fixed several selection issues
fixed some selection issues, but sadly not all :(
starting multi merge refactoring for generalization with many input fields
changed token style