branches/fault: minor updates