add some more controls, fix parsing for multiples