Now it's needn't to enter 'q' after a number!

and some small enhancements