incorporating fcs fixes into github version