Fix some glitches that were caused by the MH glitch fix (wrong prim..). Also some cleanup.