Finished MoI, more tweaks.

Weird bug with solving