tidied up makefile, added -t cmdline arg & enhanced wordlists