added trader, improved electrofloor with more opts