additional info in input, improved movement handling