disable unfold-syst, move bfit & top syst to stat, general cleanup