Merge pull request #120 from Lrns123/master

Fixed memory corruption bug in SP's ICARUS and restored most of ICARUS's functionality in MP
Fixed mistakes in previous commit