Really fixing the MFR glass!

Sorry bout the multiple commits, messed up a bit. Should be fine!