Fixed bug, and more

Fixed the big, and made the MultiGrid more elegant by removing most of
the duplicate code.