Spread ot the vm_fsm code a bit.
Snapshot actions are now propperly handled by the FSM
Some cosmetic fix.
Merge branch 'test' into dev