added FDR method choice and within subjects option