FW-228. Simulation mode now works!
FW-228. Code cleaned!