FSM save/load functionality
Default format for FSM
merge
merge problems fixed