Fixed MrFixit, cleanups.