Some new features

2-words support, new input