improved -n # handling