Made changes discussed in IRC, will fix sim tomorrow