fixed -c and -n

tweaks here and there