Extended CMFD to 2-D and added relaxation and current-weighted D options