Added fcbf, corrected errors in discrim, updated namespace