Fixed some bugs, updated sim
Removed outputs