Fixed some bugs esp in multi