Update 14-02-2018

Repaired some blocks and updated some simulation blocks
