fix the command line even more...

also better progress hooking

also different tweakables for the two stages of pbkdf2