Corrected command-line handling, fixed count bug, updated VIM mode line