enabling multicore for statemachine analyses; some code cleaning